Merge current develop branch into Stable for v2014.04-16