Merge branch 'v1.1' 31/1031/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 26 Jan 2017 16:08:48 +0000 (11:08 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 26 Jan 2017 16:08:58 +0000 (11:08 -0500)
commitab1296ba58f614eaf228c718e171d7dd59e76388
treea53812e281668d797be67aae750f37cd68fe2e32
parentd3b3a1c5d521361bfa40dbdec779495eb2bfd8a0
parentcb2e1c66e80a4ec67e77faa231577fdb8c93919f
Merge branch 'v1.1'

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>