Fix merge conflict. allow-ranking 6/head
authorAnt Zucaro <azucaro@gmail.com>
Sun, 17 Sep 2017 15:27:39 +0000 (11:27 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 17 Sep 2017 15:27:39 +0000 (11:27 -0400)

Trivial merge