We're too close to the release of Gluon 2016.1 to do a full update of our OpenWrt tree, therefore just make a backport of this.