Merge pull request #1164 from sebras/master