Merge pull request #1462 from sebras/master