Happy 2014
Merge pull request #1077 from matthewrmshin/happy-2014

Happy 2014
Merge branch 'master' into rose-bush-summary