13rc1-update
merging 1.3rc1 changes to master