Merge remote-tracking branch 'cakedc-upstream/1.3' into 1.3

Conflicts:
	vendors/shells/migration.php
allow capital letters, underscores, and dashes to be used in migration names
Merge branch '1.3' of git://github.com/mreishus/migrations into 1.3