Merge branch 'jpittman'