Merge branch 'development' into release
Added ctools patch to fix filter_xss_admin call