Merge remote-tracking branch 'origin/v1.0' 57/757/1
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Sun, 4 Dec 2016 09:18:45 +0000 (04:18 -0500)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Sun, 4 Dec 2016 09:20:01 +0000 (04:20 -0500)
Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>

Trivial merge