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