Merge branch 'master' into mapquest

diff --cc resources/imagery.xml
index 783f62bdbb21092f3fb7353fca704d1b26437c1e,f09c1bda6cc42e282a8b127b31bd35e697750491..ddb2b29384a26d336ff8f05858ec6b1893032df9
--- 1/resources/imagery.xml
--- 2/resources/imagery.xml
+++ b/resources/imagery.xml
@@@ -12,13 -12,9 +12,13 @@@
                <terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url>
                <default>yes</default>
        </set>
 +    <set>
 +        <name>MapQuest Open Aerial</name>
 +        <url>http://oatile1.mqcdn.com/naip/$z/$x/$y.png</url>
 +    </set>
        <set>
                <name>OSM - Mapnik</name>
-               <url>http://tile.openstreetmap.org/$z/$x/$y.png</url>
+               <url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url>
        </set>
        <set>
                <name>OSM - Osmarender</name>