Sync'd branch releases/release with upstream @ Wed Nov  5 20:16:33 PST 2014