Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5

Marius Cramer

2014-08-13 42539643c396f9d8865dcf9a51b13dc869709d16

install/autoupdate.php does not exist in tree abec893c20c62f7ec9bbf8594978bff247de3361