Please pull from patch-#{feature}. Branch patches-merged is for personal use. Master is in sync with @elcuervo upstream.