Adds more support for flash widget.
Merge remote-tracking branch 'origin/master'