Cherry pick 7d979c3f5c08a16d2572519877e764a8187c2e1d
Merge branch 'master/0.2' of git://github.com/novius-os/core into master/0.2