Merge pull request #1868 from koggdal/master

Update oCanvas to 2.4.1
[koggdal] Update oCanvas to 2.5.0