Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:48:47 +0000 (16:48 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 16:51:06 +0000 (16:51 +0000)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge