Merged in 1.3-dev branch into master