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)
commitbebb52c6b68786a18d2003c88b69e02b6a109172
tree2d2fc9b86abe797166ba25b60b58cff1c622876f
parentae7bbd19c580eae550ac91d549e35c1e34289503
parent0339c13297a60324fe136cdbc5e16e9c88b3754b
Merge remote-tracking branch 'origin/v2.0'

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