Merge latest changes from upstream

Travis fails due "Gateway Time-out"