Merge head of master branch to release, so that all ACE3P fixes are on the release branch. The SLAC superubuild is switching from workflows:master to workflows:release today (31-Jul-2018).