Work #475 and #458
Merge remote-tracking branch 'origin/master' into pkgr