Merge from phinze:master 2013-07-13