fixes an issue introduced with #1449
Merge remote-tracking branch 'edigonzales/master'

Conflicts:
	src/core/symbology-ng/qgslinesymbollayerv2.cpp