Merge remote-tracking branch 'upstream/develop' into merge/4466

docs/spelling_wordlist

@@ -1,8 +1,13 @@
 addons
+alt 
+Alvarado 
+anymore 
 api
+app 
 apphook
 apphooked
 apphooks
+apps 
 astagi
 automagically
 backport
@@ -14,32 +19,36 @@ cacheable
 callables
 changelist
 checkboxes
+cleanup 
+cleanups 
 clickable
 Clickjacking
-CMS
 cms
 codebase
 counterintuitive
 CSS
 customisable
 Daniele
+db 
+debian
 deprecations
 Deutsch
 dev
 dialogs
 Dini
 dirtycoder
 Divio
-Django
 django
-django CMS
 django-cms
+django CMS
 docstrings
 doctormo
 douwevandermeij
 dragbars
 driesdesmet
 elpaso
+etc 
+fallback 
 fallbacks
 Fankhauser
 fieldset
@@ -59,11 +68,13 @@ Googlemap
 Homebrew
 Html5lib
 hvad
+i 
 Iacopo
 iframe
 ikudryavtsev
 Indices
 inline
+introspected 
 ipsum
 irc
 Japanisch
@@ -80,15 +91,19 @@ Larghi
 Lauber
 ldgarcia
 lin
+linted
 linters
+Linting 
 localhost
 login
 logout
 lookup
 Lorem
 lowercased
+m 
 maqnouch
 Matteo
+max 
 Mediaeval
 middleware
 minified
@@ -102,33 +117,40 @@ namespaced
 namespaces
 newsblog
 nikolas
-nikolas
 northben
 nostalgiaz
 Obrist
 olarcheveque
 online
+Øyvind
 Paulo
 peterfarrell
+placeholder 
+placeholders 
 plugin
 plugins
 pre
 prized
 Procida
 queryset
+rc
+rd 
 reachability
 recurses
 refactor
+regexps 
 repo
 runserver
 runtime
 Saltvik
 sam
+Sass 
 Schoen
 scssc
 searchable
 Sekizai
 sephii
+Setup 
 sideframe
 sitemap
 sitemaps
@@ -141,7 +163,6 @@ stefanw
 structureboard
 stylesheets
 subclass
-subclass
 subclassed
 subclasses
 subclassing
@@ -150,6 +171,7 @@ subfolder
 subfolders
 Sylvain
 templating
+timezone 
 timgraham
 tomwardill
 toolbars
@@ -162,7 +184,6 @@ uncached
 unclosed
 uncomment
 uneditable
-uneditable
 unfussy
 unihandecode
 unimprovable
@@ -184,8 +205,8 @@ vstoykov
 whitespace
 Wohlwend
 workflows
+writable
 xframe
 YouTube
 Zürich
-Øyvind
 日本語