Merged Origin/Master and changed Camera IP address.