Merge branch 'upstream' into develop
Fix for tick colour/font not being applied

The d3 -> self.axisElement is because on a page with multiple charts, d3
styles *everything*, while self.axisElement only styles the chart we are
trying to change.
Merge pull request #228 from tpkelly/develop

Fix tick colour/font