am cd6ebaa8: (-s ours) Camera: Define all Properties via an XML data file: DO NOT MERGE

# Via Igor Murashkin
* commit 'cd6ebaa8e4567f3b425393a1badeef4f7c9496ae':
  Camera: Define all Properties via an XML data file: DO NOT MERGE