Sync'd branch releases/beta with upstream @ Wed Nov 12 14:23:52 PST 2014