Merge in unstable branch:

commit 19cb1f27eac770ad10c732f6ab687503d27dd686
Author: Ben Osman <dev@smoothify.com>
Date:   Tue Dec 9 10:09:22 2014 +0000

    Change 'i386 amd64' architectures in 'control' to any