Merge branch 'master' into gsoc2012