Concrete 3.2.1-SNAPSHOT fixes.
Merge branch 'master' of github.com:hltcoe/concrete-agiga