Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline