Sync'd branch releases/release with upstream @ Sun Nov  2 13:53:31 PST 2014