master
python2to3: fixed inconsistent use of tabs and spaces in indentation
new branch from a clean area, deriving from branch newProtonTransport_NoDataDir