Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	ios/.DS_Store
	iso/.DS_Store