shotastage/Candy — pull request #1 by shotastage (2014-03-03 11:04:56+00:00)
Title: Testing

Marge from Testing branch.