- quite tricky merge due to merges and reverts made due to a faulty mysql-5.1 tag in the repo.
 - greate care has howevere been taken to compare all files and assure that only changes
   marked with MCPs' differs from 5.6.12 (with a few small already existing exceptions)