Import from svn branch

Revision 50293 imported