Merge branches 'chris' and 'master' into chris