Merge tag 'debian/0.25_rc0-2'
authorDavid Bremner <david@tethera.net>
Mon, 17 Jul 2017 12:20:10 +0000 (09:20 -0300)
committerDavid Bremner <david@tethera.net>
Mon, 17 Jul 2017 12:20:10 +0000 (09:20 -0300)
merge 32 bit compilation fix


Trivial merge