thelia/thelia — pull request #936 by roadster31 (2014-11-29 21:07:39+00:00)
Title: Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.