[trunk revision 170512]
