Merge branch 'v2.0' 38/1838/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 16 May 2017 17:10:27 +0000 (13:10 -0400)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 16 May 2017 17:10:49 +0000 (13:10 -0400)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge