Merge branch 'hotfix/3.0.4'
Merge branch 'release/3.0.0dev1'
Merge branch 'release/3.0.0dev2'
fix php 5.4
Merge branch 'hotfix/3.0.0dev3' into develop