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