vosphere backup 11/11/2014
test
Fix merging issues