Master changes

From Master Branch:
- Merge 4.5
- Fix issue when loading images in Chrome
- Disable-able animated GIFs
- remove fields from 4.5 to 5.0 migration