Merge current develop into stable for v2014.02.27