Merge branch 'release/0.10.1'
Merge tag '0.10.1' into develop

Compile support for Xcode6