VanillaDev/Vanilla — pull request #497 by Sleaker (2013-01-13 17:28:33+00:00)
Title: rebased onto master

This resolves the 2 lines that wont merge properly in the future.