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