Merge `2.1.x` into `master`

Merging all the fixes and stuff from `2.1.x` into `master`.

Will need testing on all platforms:

  - [ ] Chrome (`18,83%`)
    - [ ] Mac OSX (`~0%`)
    - [ ] Windows (`13,93%`)
    - [ ] Android (`2,49%`)
    - [ ] iOS (`2,41%`)
  - [ ] Safari (`48,48%`)
    - [ ] iOS 7 (`47,7%`)
    - [ ] Mac OSX (`0,78%`)
  - [ ] Internet Explorer (`19,66%`)
    - [ ] 11 (`13,41%`)
    - [ ] 10 (`3,4%`)
    - [ ] 9 (`2,85%`)
  - [ ] Android Browser (`5,6%`)