Merge branch 'master' of /Users/john/devels/jetgray with conflicts.
test passing