should work
Merge branch 'master' into gh-pages

Conflicts:
	src/TestProject.as