Merge branch 'release/1.1' into develop
Change syntax to be PHP <5.4 compatible
Version number
Merge branch 'release/1.1.1'