Merged on VirtualBox
authorVZ Cambria <vzcambria@gmail.com>
Mon, 20 Feb 2017 17:25:23 +0000 (12:25 -0500)
committerVZ Cambria <vzcambria@gmail.com>
Mon, 20 Feb 2017 17:25:23 +0000 (12:25 -0500)

Trivial merge