Sync'd branch releases/beta with upstream @ Mon Nov 10 02:43:19 PST 2014