master #1

Open
Nancok wants to merge 3 commits from master into 29-11-13

3 Commits