Merge branch 'v2.0' into v2.0-imageresize-onerror
Merge pull request #222 from mobify/v2.0-imageresize-onerror

Merge branch 'v2.0' into v2.0-imageresize-onerror