Rettet kamera
2.1
version 2.4
Merge branch '2.4'
2.4