commit 10950eaf9a5e521d61f2f5d171045377f934b3d6 Merge: 94cbc0cccba 2d659e53829 Author: Nate McMaster <[email protected]> Date: Thu Jun 28 16:53:45 2018 -0700 Merge branch 'release/2.2' into dev