Merge remote-tracking branch 'origin/v2.0' 81/1781/1
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)
commitbe6d8ea13f494d0e492a0032e3e84c5a94e4bd62
tree2d2fc9b86abe797166ba25b60b58cff1c622876f
parent61e823ad5f3a48a2a34d1c1ae934250ec0b04bc5
parent1ac978f5312c79761f1d36f25a2e407ffd33c13c
Merge remote-tracking branch 'origin/v2.0'

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