Version 1.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	matrix.min.js
	src/matrix.js