Adding Mutlu's changes to avoid the Ubuntu problems.
Merge remote-tracking branch 'origin/development' into development