commit 183b5364447423e61f32d3c54e6bbccde1a1440e
Merge: 6ed8896 d15e5e4
Author: Phil Holmes <mail@philholmes.net>
Date:   Sun Sep 23 10:47:52 2012 +0100

    Merge remote branch 'origin/master' into release/unstable

