Merge pull request #3429 from Segrain/dev

Maintenance access, again.
Camera console controls.