Refactoring using helpers.options.resolve#5965

simonbrunel merged 4 commits intochartjs:masterchartjs/Chart.js:masterfrom

nagix:issue-5965nagix/Chart.js:issue-5965Copy head branch name to clipboard