Fixes #201: Rare cases where "functions.php" is included twice leads to error
Merge branch 'master' into 5.0