Sync'd branch releases/beta with upstream @ Wed Nov 12 12:43:47 PST 2014