Import changes from official rqr-0.2.3.gem