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