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

Trivial merge