Sync'd branch releases/beta with upstream @ Wed Nov 12 21:29:48 PST 2014