Merge pull request #1647 from nnnick/fix/1324

Fall back to line settings for points if necessary

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

diff --cc test/controller.line.tests.js
Simple merge