Close GH-4: Sotry #3012.
Merge branch 'master' into danderson/story