Merge pull request #1076 from schuellerf/master