Merge pull request #202 from axet/for-15.05