Change-Id: Ib126c83423e61400bf369985815d7030b2e03c6e
Signed-off-by: panacotta <alejoar@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	papiplot/src/plot.c