Merge remote-tracking branch 'corristo/osx-ci'

This commit is contained in:
Marc Zinnschlag 2015-02-16 15:30:29 +01:00
commit acb351c047