Sync'd branch releases/beta with upstream @ Wed Nov 12 09:40:55 PST 2014