Sync'd branch releases/beta with upstream @ Thu Nov 13 04:59:28 PST 2014