(Hopefully) fix my bad merge.
(Hopefully) fix my bad merge.

openpnp/openpnp-capture,trcwm/openpnp-capture,openpnp/openpnp-capture,trcwm/openpnp-capture,trcwm/openpnp-capture,openpnp/openpnp-capture,openpnp/openpnp-capture,trcwm/openpnp-capture,trcwm/openpnp-capture,openpnp/openpnp-capture,openpnp/openpnp-capture,trcwm/openpnp-capture