Merge commit '46350db737a15910f468d30cf7beda16a4cc8332'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:47:46 +0000 (16:47 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:47:46 +0000 (16:47 +0000)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge