am 5168509f: Merge "Trimming: clean up strings and prevent too short or no...
am 5168509f: Merge "Trimming: clean up strings and prevent too short or no trimming." into gb-ub-photos-arches
* commit '5168509f':
Trimming: clean up strings and prevent too short or no trimming.