Merge latest commits from py3/data
Authored by: klaussfreire 2013-03-31
Parent: [r13616]
Child: [r13618]