Previous values in  stored in comments
Merge branch 'apache' into apache-php