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