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

commit 2a3d0336485e10be4ab965827aa6d77ec523e994
Author: Marijn Ophorst <marijn@sensimedia.nl>
Date:   Wed Mar 12 09:56:55 2014 +0100

    just use the singleton

monomelodies/monolyth,monomelodies/monolyth