Updated stable branch to revision 42039