Merge remote-tracking branch 'upstream/master'

Conflicts:
web/src/main/resources/js/views/DeviceView.js