Fixes https://github.com/monarch-initiative/monarch-app/issues/256
Merge remote-tracking branch 'origin/master'