am 5af37fff: (-s ours) am 5856975d: Change Settings name

* commit '5af37fff93110e202ff24b87128f5da96d0642a3':