Merge remote-tracking branch 'ispc/master'

Marius Cramer

2015-05-21 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f

interface/web/tools/import_plesk.php does not exist in tree 4c03864b47e2e6b29afeb7a6479ad840187e5ce6