Sync'd branch releases/beta with upstream @ Mon Nov 10 13:32:46 PST 2014