commit fa41ae813169d5014633a9b3b4f82aade23ebe57
Merge: a5cc607 1ff377d
Author: Phil Holmes <mail@philholmes.net>
Date:   Sun Sep 14 17:53:25 2014 +0100

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

