Merge commit '03ef89faf23c4851848208c9fe004cd9ef690cec'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 18:27:19 +0000 (18:27 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 18:27:19 +0000 (18:27 +0000)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge