Fixes various bugs related to OS X Mavericks
Merge branch 'release/1.0'