Merge branch 'master' into take2