Merge remote-tracking branch 'remotes/artyom/tags/pull-sun4v-20170118' into staging