Sync'd branch releases/beta with upstream @ Tue Nov  4 07:38:35 PST 2014