Merge pull request #1 from ruinra/master

141128:pm8