Merge branch 'master' into CURATOR-244
authorrandgalt <randgalt@apache.org>
Mon, 18 Jan 2016 23:04:07 +0000 (18:04 -0500)
committerrandgalt <randgalt@apache.org>
Mon, 18 Jan 2016 23:04:07 +0000 (18:04 -0500)

Trivial merge