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