Merge tag 'rel/2.1.0'
authorJosh Elser <elserj@apache.org>
Fri, 23 Mar 2018 13:51:19 +0000 (09:51 -0400)
committerJosh Elser <elserj@apache.org>
Fri, 23 Mar 2018 13:51:19 +0000 (09:51 -0400)
Release 2.1.0


Trivial merge