Quick fix (without tests :cry:) for edge case when flash is nil
Merge branch 'master' into 0.3.x