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

Trivial merge