Merge pull request #1211 from sebras/master