Changed development branch
Merge pull request #5494 from skasperski/master

Changed development branch