1.3 compatible

Please merge!