Merged changes from 2013.07