Merge branch 'obrazy' into rwd