merge with astaxie master