Manually merge olliehs commits

Signed-off-by: Sean Qureshi <sean@tox.im>
Merge branch 'pullrequest'