Merge branch 'issue/2972'
Merge branch 'issue/2968'
Merge branch 'issue/3022'
Merge branch 'issue/3021'
Merge branch 'issue/2943'
Merge branch 'issue/3029'
Merge branch 'feature/sortable-downloads'
Merge branch 'session-fixes'
Merge branch 'feature/sortable-downloads'
Fixes mb_convert_encoding usage when it may not be available
Merge branch 'issue/fix-emogrifier'
Merge remote-tracking branch 'upstream/master' into feature/session-rewrites