Ticket #132 proper cross-browser solution
Ticket #132 rebuilding