Merge master to development branch

How about we merge the current master to the development branch to make them in sync, since it's the wrong way now (master is ahead of development)? @wikia-gregor @federico-lox @ArturKlajnerok