Moved to revision 5ca6c2faa0ea60771808819ab98a0df87689a9f7, XE6 support