Merge pull request #142 from mmunz/for-15.05