Merge pull request #92 from dangowrt/for-15.05.01
authorDaniel Golle <dangowrt@users.noreply.github.com>
Wed, 11 Nov 2015 00:56:06 +0000 (01:56 +0100)
committerDaniel Golle <dangowrt@users.noreply.github.com>
Wed, 11 Nov 2015 00:56:06 +0000 (01:56 +0100)
backport fixes and minor updates from master to for-15.10


Trivial merge