Fixed scaling issue in #303
Merge remote-tracking branch 'drgz/master'

Conflicts:
	src/matlab2tikz.m