branch 20131010 changes