Sync'd branch releases/beta with upstream @ Sun Nov  2 05:15:09 PST 2014