Update to latest on master 25.7.2013