PROV-734 check setting to avoid javascript errors
Merge branch 'master' of https://github.com/collectiveaccess/providence