Merge branch 'master' of github.com:openlayers/openlayers into transform

Conflicts:
	theme/default/style.css

theme/default/style.css

@@ -511,6 +511,11 @@ a.olControlZoomOut {
     transform: none;
 }
 
+/* when replacing tiles, do not show tile and backbuffer at the same time */
+.olTileImage.olTileReplacing {
+    display: none;
+}
+
 /* override any max-width image settings (e.g. bootstrap.css) */
 img.olTileImage {
     max-width: none;