Dev commit from 31.3.14
Merge remote-tracking branch 'origin/dev' into dev