Fixing conflicts
Merge branch '1.3.3'
Merge remote-tracking branch 'upstream/master'

Commit!
.
Fix #2855