Merge branch 'release' into develop

@@ -235,7 +235,7 @@
     
     // FIXME - someday check the return codes on these binds.
     else if ([obj isKindOfClass:[NSData class]]) {
-        sqlite3_bind_blob(pStmt, idx, [obj bytes], (int)[obj length], SQLITE_STATIC);
+        sqlite3_bind_blob(pStmt, idx, [obj bytes], (int)[(NSData *)obj length], SQLITE_STATIC);
     }
     else if ([obj isKindOfClass:[NSDate class]]) {
         sqlite3_bind_double(pStmt, idx, [obj timeIntervalSince1970]);

@@ -943,9 +943,9 @@
 - (void)zoomWithRMMercatorRectBounds:(RMProjectedRect)bounds
 {
 	[self setProjectedBounds:bounds];
-	[overlay correctPositionOfAllSublayers];
 	[tileLoader clearLoadedBounds];
 	[tileLoader updateLoadedImages];
+	[overlay correctPositionOfAllSublayers];
 	[renderer setNeedsDisplay];
 }
 

@@ -67,6 +67,7 @@
 - (void)clearLoadedBounds
 {
 	loadedBounds = CGRectZero;
+    [[content imagesOnScreen] removeAllTiles];
 }
 
 - (BOOL)screenIsLoaded