commit 60041b5b2bcb84a9a6b9eb460f6e395a270934c8 Merge: 6a2f83f2830 3177be42f50 Author: Nate McMaster <[email protected]> Date: Thu Jun 28 16:53:44 2018 -0700 Merge branch 'release/2.2' into dev