Sync'd branch releases/beta with upstream @ Thu Nov 13 07:09:54 PST 2014