This branch cannot be automatically merged with the master branch (which has already been merged with the compact-code branch), so that its features have been manually implemented into the master branch and if everything is ok it may be safely deleted.