Merge remote-tracking branch 'origin/dev-1.2.5' into dev-1.2.5

Conflicts:
	_src/plugins/table.js
Merge remote-tracking branch 'origin/dev-1.2.5' into dev-1.2.5

Conflicts:
	_src/plugins/table.js