Merge branch 'MDL-51532-master' of git://github.com/damyon/moodle

diff --cc lib/thirdpartylibs.xml
Simple merge

diff --cc lib/upgrade.txt
index fab3a83,144da6a..e27a0a6
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -3,7 -3,7 +3,8 @@@ information provided here is intended e
  
  === 3.0 ===
  
 +* Minify updated to 2.2.1
+ * htmlpurifier upgraded to 4.7.0
  * External functions x_is_allowed_from_ajax() methods have been deprecated. Define 'ajax' => true in db/services.php instead.
  * External functions can be called without a session if they define 'loginrequired' => true in db/services.php.
  * All plugins are required to declare their frankenstyle component name via