Incorporate changes from features pushed upstream.

Signed-off-by: Atheriel <atheriel@gmail.com>
Merge branch 'master' of github.com:mboehn/pure-single