Sync'd branch releases/beta with upstream @ Wed Nov  5 13:31:19 PST 2014