Merge vm-toaster development branch in to master

The development branch has temporarily stabilized; move it in to master.