Change-Id: I9be81019917343fabbcaabd22c6e20826199dad5
Merge branch 'master' of https://github.com/ricruigon/opera4.git