Merge remote-tracking branch 'origin/v2.0'
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Fri, 5 May 2017 18:10:52 +0000 (14:10 -0400)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Fri, 5 May 2017 18:10:59 +0000 (14:10 -0400)
Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

Trivial merge