Merge branch 'cashpipeplusplus-master'
authorjoan <joan@abyz.co.uk>
Sun, 30 Oct 2016 18:49:52 +0000 (18:49 +0000)
committerjoan <joan@abyz.co.uk>
Sun, 30 Oct 2016 18:49:52 +0000 (18:49 +0000)

Trivial merge