Merge pull request #1902 from MPOS/development

Merging Development to master
Merge pull request #1944 from MPOS/development

[MASTER] Update from Development