the branches

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge branch 'master' into sk1103