Merged 1.3.4 with this.