Added a shortcutfor --list-platforms param
Merge remote-tracking branch 'origin/develop' into develop