crash fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bird/Bird.v12.suo