Damian Mooyman 43298b9ae2 Merge remote-tracking branch 'origin/1.0'
# Conflicts:
#	composer.json
2016-05-11 16:10:07 +12:00
..