Merge branch 'sugar_add_ios_test' into master
Update for multiple targets
Merge branch 'master' into travis-ci.macosx.branch