Merge commit '1647156e0a9ce2cda113a7e8dba62882da5b8362'

* commit '1647156e0a9ce2cda113a7e8dba62882da5b8362':
  bugfix: add sstream include chore: update XCode settings

# Conflicts:
#	scoped_buffer_capture.xcodeproj/project.pbxproj

include/scoped_buffer_capture.h

@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <sstream>
+
 class scoped_buffer_capture_t {
 public:
   scoped_buffer_capture_t(std::ostream & stream)

scoped_buffer_capture.xcodeproj/project.pbxproj

@@ -87,7 +87,7 @@
 		CD0C593320C2D81E00454F82 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1230;
+				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = "Sam Jaffe";
 				TargetAttributes = {
 					CD0C593A20C2D81E00454F82 = {