Sync'd branch releases/release with upstream @ Tue Nov  4 07:25:10 PST 2014