Merging unstable (multi user work) into unstable23 (previously known as cordova34)