This smokes us.
Oops.
Already done.
Merge branch '20130914-git-merge-more'
Merge commit '7270b0fad26f'