Merge branch 'CURATOR-275' of github.com:joelittlejohn/curator into CURATOR-275
authorrandgalt <randgalt@apache.org>
Tue, 24 Jan 2017 01:53:00 +0000 (20:53 -0500)
committerrandgalt <randgalt@apache.org>
Tue, 24 Jan 2017 01:53:00 +0000 (20:53 -0500)

Trivial merge