Merge branch 'master' of github.com:ppy/osu into better-transforms

# Conflicts:
#	osu-framework

osu.Desktop.VisualTests/Tests/TestCaseBeatSyncedContainer.cs

@@ -151,6 +151,8 @@ namespace osu.Desktop.VisualTests.Tests
 
             private int calculateBeatCount(TimingControlPoint current)
             {
+                if (timingPoints.Count == 0) return 0;
+
                 if (timingPoints[timingPoints.Count - 1] == current)
                     return (int)Math.Ceiling((Beatmap.Value.Track.Length - current.Time) / current.BeatLength);
 

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -81,7 +81,7 @@ namespace osu.Desktop.VisualTests.Tests
         {
             return new Player
             {
-                Beatmap = beatmap
+                InitialBeatmap = beatmap
             };
         }
     }

osu.Desktop.VisualTests/Tests/TestCaseResults.cs

@@ -59,7 +59,7 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             })
             {
-                Beatmap = beatmap
+                InitialBeatmap = beatmap
             });
         }
     }