commit 56c5600b20342386de467bb02b7117a785518458 Merge: d7ff7503341 519851627cd Author: Nate McMaster <[email protected]> Date: Thu Jun 28 16:53:53 2018 -0700 Merge branch 'release/2.2' into dev