Resolve conflicts
Merge branch 'jprichardson-master' into upstream-merge