Sync'd branch releases/release with upstream @ Tue Nov  4 14:05:58 PST 2014