Merge commit 'c752bd46b4cda2c0614dde761273068b8c3ccb58' * commit 'c752bd46b4cda2c0614dde761273068b8c3ccb58': Add high ISO setting.