(hopefully only) maintenance changes in location choice code
Authored by: vsp_nagel 2013-02-02
Parent: [r22861]
Child: [r22863]