Patched dev 3.x aui 1313