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