Merge branch 'jh/status-aheadbehind'