Merge pull request #882 from narfbg/develop-core-common

Improve core/Common.php