Merge pull request #2136 from pandamasta/master