Merge branch 'master' into 'feature/apps-timetracker'

# Conflicts:
#   base/apps/install-list