Merge pull request from orlando/master