Revision 1462047

Not an elegant solution nor one that's maintainable in the long run but hopefully should be enough to get the release 0.9 out the door. Once this has been cut, we need to find a better solution.