Merge branch 'v2.0'

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