commit 753d6200e9ae51f0a98186478beff2d00d63a62b
Merge: fc5b145 2e0077b
Author: Phil Holmes <mail@philholmes.net>
Date:   Tue Aug 30 11:23:53 2016 +0100

    Update release/unstable with recent changes