merged request 26
merged request 26

nemomobile-graveyard/mcompositor,siraj/mcompositor,nemomobile-graveyard/mcompositor,siraj/mcompositor,nemomobile-graveyard/mcompositor,siraj/mcompositor,nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor,nemomobile-graveyard/mcompositor,siraj/mcompositor