Merge branch 'v1.0' 98/598/1
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Thu, 3 Nov 2016 15:51:30 +0000 (15:51 +0000)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Thu, 3 Nov 2016 15:51:55 +0000 (15:51 +0000)
Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>

Trivial merge