commit e6bc480ff17d5506a6821a29cf9c839797d665a4
Merge: 0772007 929b24e
Author: Phil Holmes <mail@philholmes.net>
Date:   Sun Oct 20 15:51:31 2013 +0100

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

