Merge branch 'v2.0' 20/1820/1
authorKiran Kashalkar <kiran.kashalkar@riftio.com>
Fri, 12 May 2017 20:50:45 +0000 (20:50 +0000)
committerKiran Kashalkar <kiran.kashalkar@riftio.com>
Fri, 12 May 2017 20:50:45 +0000 (20:50 +0000)

Trivial merge