Merge branch 'master' into penfield, cleaned up.