6.x-1.7-beta1
2870bbfa · Fixed merge error. ·