Merge remote-tracking branches 'origin' and 'origin/master'
Mon Jan 27 04:58:53 MST 2014 - Fix for multiple advanced vm networking & processing env