Merge pull request #234 from micmac1/libs-for-15.05