Merge branch 'v1.1' 15/1115/1
authorKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Mon, 13 Feb 2017 15:43:22 +0000 (10:43 -0500)
committerKIRAN KASHALKAR <kiran.kashalkar@riftio.com>
Mon, 13 Feb 2017 15:43:22 +0000 (10:43 -0500)

Trivial merge