Sync'd branch releases/beta with upstream @ Wed Nov 12 10:24:56 PST 2014