Merge pull request #108 from blogic/for-15.05