Merge from 3.1.x branch

.travis.yml

@@ -210,3 +210,4 @@ matrix:
       env: DJANGO=1.9 DATABASE_URL='mysql://root@127.0.0.1/djangocms_test' SELENIUM=0
 
   fast_finish: true
+

CHANGELOG.txt

@@ -74,6 +74,11 @@
 - Fixed an issue where ``allow_children`` and ``disable_child_plugins`` didn't work on dragitems
 
 
+=== 3.1.6 (unreleased) ===
+
+- Fix cache settings
+
+
 === 3.1.5 (2016-01-29) ===
 
 - Fixed a tree corruption when pasting a nested plugin under another plugin.
@@ -194,6 +199,13 @@
 - Add "Structure mode" permission
 
 
+=== 3.0.17 (unreleased) ===
+
+- Fix ExtensionToolbar when language is removed but titles still exists…
+- Fix PageSelectWidget JS syntax
+- Fix cache settings
+
+
 === 3.0.16 (2015-11-24) ===
 
 - Fixed JavaScript error when using ``PageSelectWidget``

cms/templates/admin/cms/page/change_form.html

@@ -103,6 +103,10 @@ <h2>{% trans 'All permissions' %}</h2>
 </form>
 </div>
 
+{% block admin_change_form_document_ready %}
+{{ block.super }}
+{% endblock %}
+
 {% for url in unihandecode_urls %}<script src="{{ url }}" type="text/javascript"></script>{% endfor %}
 {% if unihandecode_urls %}
 <script>