commit eba2d7e380fef9f75203bb9a1f4d30827451d512 Merge: eecd40d4404 e76c04eecc2 Author: Nate McMaster <[email protected]> Date: Thu Jun 28 16:53:46 2018 -0700 Merge branch 'release/2.2' into dev