iossim builds were mucking everything up so I disabled them
Merge remote-tracking branch 'origin/master'