Sync with Gitlab.
authorAnt Zucaro <azucaro@gmail.com>
Sat, 7 Oct 2017 13:08:56 +0000 (09:08 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sat, 7 Oct 2017 13:08:56 +0000 (09:08 -0400)

Trivial merge