Merge base-installer (1.154) import into refs/heads/workingbranch
authorRaspbian Automatic git importer <root@raspbian.org>
Thu, 22 Dec 2016 06:07:38 +0000 (06:07 +0000)
committerRaspbian Automatic git importer <root@raspbian.org>
Thu, 22 Dec 2016 06:07:38 +0000 (06:07 +0000)

Trivial merge