fixes SPOT-1259
Merge branch 'master' of https://github.com/uw-it-aca/spacescout_admin