Merge branch 'v1.1' 24/1124/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 16 Feb 2017 18:53:01 +0000 (13:53 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 16 Feb 2017 18:53:48 +0000 (13:53 -0500)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge