Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/helpers/ServiceLayerHelper.js