Merge branch 'master' into update-objc

Conflicts:
	AsyncDisplayKit/ASCellNode.h

AsyncDisplayKit/ASViewController.h

@@ -22,6 +22,15 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)initWithNode:(ASDisplayNode *)node;
 
+/**
+ * The constrained size used to measure the backing node.
+ *
+ * @discussion Defaults to providing a size range that uses the view controller view's bounds as
+ * both the min and max definitions. Override this method to provide a custom size range to the
+ * backing node.
+ */
+- (ASSizeRange)nodeConstrainedSize;
+
 @end
 
 NS_ASSUME_NONNULL_END