Merge branch 'v2.0'
authorKiran Kashalkar <kiran.kashalkar@riftio.com>
Thu, 11 May 2017 14:18:41 +0000 (14:18 +0000)
committerKiran Kashalkar <kiran.kashalkar@riftio.com>
Thu, 11 May 2017 14:18:41 +0000 (14:18 +0000)

Trivial merge