Latest changes on hotfix/2013-12-04 to master