mono/mono — pull request #923 by ermshiperete (2014-02-27 17:09:51+00:00)
Title: Cherry picks from master

Cherry-pick some changes from master