Merge pull request #291 from jofomah/fix/stock-graph-style

Fix/stock graph style
Merge branch 'upstream-develop' into fix/fixture-update