Merge branch 'CB-11517'
authorJesse MacFadyen <purplecabbage@gmail.com>
Fri, 2 Sep 2016 00:37:27 +0000 (17:37 -0700)
committerJesse MacFadyen <purplecabbage@gmail.com>
Fri, 2 Sep 2016 00:37:27 +0000 (17:37 -0700)

Trivial merge