Vanilla/Vanilla — pull request #633 by kitskub (2013-07-02 18:01:50+00:00)
Title: Fix merge error

This error slipped past the merge.