Master -> 1.3.0

Cherry picking fix for nil fetched controller issue on iphone 4