Hobbit feature changes.
Merge pull request #1 from amcbrearty/bushy-beard-feature

Simple change
Merge branch 'master' into hobbit-feet-feature
Merge pull request #2 from amcbrearty/hobbit-feet-feature

Hobbit feature changes.
Merge remote-tracking branch 'origin/master' into bushy-beard-feature