misc

Signed-off-by: Mattias Andrée <maandree@operamail.com>
store map minors inside map majors

Signed-off-by: Mattias Andrée <maandree@operamail.com>
resolve merge conflict

Signed-off-by: Mattias Andrée <maandree@operamail.com>
derp

Signed-off-by: Mattias Andrée <maandree@operamail.com>
resolve merge conflict

Signed-off-by: Mattias Andrée <maandree@operamail.com>
Merge branch 'master' into develop
store map minors in the map majors

Signed-off-by: Mattias Andrée <maandree@operamail.com>
m

Signed-off-by: Mattias Andrée <maandree@operamail.com>