Comment 17 for bug 1621340

@cyphermox - to me the patches look good to me, could you take a look at sponsoring them into Yakkety Xenial?