Merge remote-tracking branch 'remotes/pmaydell/tags/pull-cocoa-20150619-1' into staging