Merge current develop branch into Stable for v2014.07.29