merging master
Merge branch 'fargo' of github.com:Xarthisius/piernik into fargo
Merge branch 'fargo' of github.com:Xarthisius/piernik into fargo