Merge remote-tracking branch 'origin/master'

.coveragerc

@@ -2,9 +2,10 @@
 branch = True
 omit =
     *migrations*
-    settings_*
-    jenkins_cleanup*
-    wsgi*
+    */settings_*.py
+    */settings.py
+    */jenkins_cleanup.py
+    */wsgi.py
 
 [paths]
 source = .