Sync'd branch releases/release with upstream @ Wed Nov  5 22:14:35 PST 2014