KILL #1759 THE IMPOSSIBLE BUG KILL KILL
Merge branch 'master' into development