Provide branch alias for 1.0
Provide branch alias for 2.0
Avoid using a feature not supported in PHP5.3
Revert "Provide branch alias for 1.0"

This reverts commit e8ea4e910fe7adb5ca9183139772b99789b285ac.
Revert "Provide branch alias for 2.0"

This reverts commit 920f16965fb28362ee24503f0654c0b4917eb4c4.
Merge branch '1.0.x' into 2.0.x
Merge branch 'pr/262' into 2.0.x