Merge remote-tracking branch 'origin/build-fix' into build-fix

# Conflicts:
#	apis/authentication.py
#	apis/dataset.py
#	model/study_metadata/identifiers.py