Update shitty framework.
Fix for 3.0-3.2+ upgrade issue.
Merge remote-tracking branch 'upstream/master' into i18n
Updating from upstream