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