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