Merge current develop branch into Stable for 2014.02.16