Merge commit '069f90b'
authorJoel Martin <github@martintribe.org>
Fri, 18 Dec 2015 19:29:08 +0000 (13:29 -0600)
committerJoel Martin <github@martintribe.org>
Fri, 18 Dec 2015 19:29:08 +0000 (13:29 -0600)

Trivial merge