[Merge] ~rbalint/shim/+git/shim:master into ~ubuntu-core-dev/shim/+git/shim:master

[Dimitri John Ledkov]

Also I guess we should start taking all patches that are merged into shim master too... I.e.

https://github.com/rhboot/shim/pull/361/files
https://github.com/rhboot/shim/pull/362/files


-- 
https://code.launchpad.net/~rbalint/shim/+git/shim/+merge/401388
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~rbalint/shim/+git/shim:master into ~ubuntu-core-dev/shim/+git/shim:master.