Fix bug introduced in 3c240fe19174385e710186d65b2a25dae8b1ab65
Merge pull request #1983 from michael-e/fix-the-fixed-core-fields

Fix bug introduced in 3c240fe19174385e710186d65b2a25dae8b1ab65
Update views
Merge branch 'integration' of github.com:symphonycms/symphony-2 into integration
Fixes for XMLElement with text children
Ensure that libxml_disable_entity_loader is disabled for XSLT loading (as it's not thread safe). Closes #1939
Add Providers Caching support to Symphony. Closes #1046
Allow Symphony to capture fatal errors, display them and log them. Closes #1948
Fix table height

Closes #1985
Merge branch 'integration' of github.com:symphonycms/symphony-2 into integration
Change to using filename from basename

https://github.com/symphonycms/symphony-2/pull/1975

Swap `basename` for `filename` to avoid files having their extension added to their name on save: filename-jpg.jpg is created if `basename` is used.
Merge pull request #1987 from andrewminton/patch-1

Change to using filename from basename
resolves #1904
fixed wrong url
included punycode library
made collapsible work with idn
cleaned up formatting
added route parameter to javascript, removed punycode library
Merge pull request #1988 from jensscherbl/idn

resolves #1904, fixes #1901
Create global context id, fix a few script inconsistencies