bug fixes for 28rc
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	lib/version.rb