Merge branch 'master' of https://github.com/dfreiregit/Canvas into release/Release_INGcss
Merge branch 'release/ReleaseINGfix'