Merge branch 'CURATOR-286' of github.com:joelittlejohn/curator into CURATOR-286
authorrandgalt <randgalt@apache.org>
Mon, 8 Feb 2016 18:21:04 +0000 (13:21 -0500)
committerrandgalt <randgalt@apache.org>
Mon, 8 Feb 2016 18:21:04 +0000 (13:21 -0500)

Trivial merge