Merge branch 'v2.0'
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Fri, 5 May 2017 03:36:09 +0000 (23:36 -0400)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Fri, 5 May 2017 03:36:09 +0000 (23:36 -0400)

Trivial merge