Merge pull request #2524 from ashiguruma/master

Allow canvas patterns instead of colors

diff --cc src/controllers/controller.bar.js
Simple merge

diff --cc src/controllers/controller.line.js
Simple merge

diff --cc test/core.helpers.tests.js
Simple merge