Sync to fix the FTBFS, as described by bug 791275
Can confirm that this version builds fine on ARM again.
Sync to fix the FTBFS, as described by bug 791275
Can confirm that this version builds fine on ARM again.