Ubuntu trusty is different, this just cleans up some errors
Merge branch 'hotfix/0.1.2'