Merge branch 'master' of /home/mariuszs/git/fairyland with conflicts.
loremipsu refactored as one item