Merge in the es6 branch then update dependencies

This commit is contained in:
Jonny Barnes 2017-01-26 15:34:27 +00:00
commit b4671f322b

457
composer.lock generated

File diff suppressed because it is too large Load diff