nostlie/MergeTest — pull request #1 by nostlie (2013-03-13 17:03:17+00:00)
Title: DevB doing his job, I guess

Please add my changes