Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/app/components/utils/user-password-input.vue