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

Trivial merge