Merge branch 'v1.1' 61/1061/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 1 Feb 2017 15:54:25 +0000 (10:54 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 1 Feb 2017 15:54:41 +0000 (10:54 -0500)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge