updates from master 2013-02-05