Merge remote-tracking branch 'kraxel/tags/pull-vga-20161205-1' into staging