David Price

Merge branch 'master' into june15-4pm