Undo simplify condition. It requires a newer version of php.
Merge branch 'master' of github.com:marius300482/meta