Sync'd branch projects/holly with upstream @ Tue Nov  4 15:07:15 PST 2014