Merge pull request #239 from sarumpaet/for-15.05