...
Merge pull request #1155 from darkwing/david-walsh-is-a-noob-2

...