commit f320511b63da35571e890d53f3906c7761cd00a1 Merge: f62559dd618 0c84821f23b Author: Nate McMaster <[email protected]> Date: Thu Jun 28 16:53:42 2018 -0700 Merge branch 'release/2.2' into dev