Fix: error with php strict mode
Fix: strict mode anarchy ;-)
check your variable please
Merge branch 'Upstream/develop'