Merge pull request #197 from nemomobile-packages/next

Merge quite a many things from 'next' to 'master'