Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
working on a solution for base64 crossorigin issue #402
omit img cross-origin setting if image type is base64. this image format will be loaded locally so we don't need to account for cross origin as discussed in issue #402
Merge remote-tracking branch 'upstream/master'
fixed typo in comments for base64 fix #418
Merge pull request #418 from jshaw/master

Support for base64 data