Updated stable branch to revision 41096