Fix #465
Fix #464
Merge remote-tracking branch 'origin/master' into pkgr