Fixed PHP5.4 notices
Merge branch 'development' into dev/j2/free