Merge branch 'master' into navigation

1 job for navigation in 3 minutes and 42 seconds (queued for 3 seconds)
Status Name Job ID Coverage
  Build
passed assembleDebug #5317

00:03:42