bug fixing refs #issue-1512
Merge branch 'feature/issue-1512' into merge-1512

Conflicts:
	test/jasmine/spec/plugins/copyPasteSpec.js