Fix crash searching for Main storyboard.
Merge branch 'master' into dev