flow: Promoted <develop> 'trunk' (7c08161e01dc) to 'feature/osx-fixing'.
feature/osx-fixing
2015-03-05, Gary Kramlich