merge conflict fixed?
Merge branch 'master' into chris-andrea