update from upstream
authorHannes Mannerheim <h@nnesmannerhe.im>
Fri, 9 Oct 2015 12:40:43 +0000 (14:40 +0200)
committerHannes Mannerheim <h@nnesmannerhe.im>
Fri, 9 Oct 2015 12:40:43 +0000 (14:40 +0200)

Trivial merge