Update common.php
Merge branch 'master' into website-rewrite