Squashed commit of the following:
Squashed commit of the following:

commit 1c4fe83367b60e79b20a2f1f8163249c7416dad2
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Fri Feb 21 15:21:09 2014 +0100

    deprecated, but fix up somewhat nonetheless

monomelodies/monolyth,monomelodies/monolyth