Imports latest changes from scandio/lmvc-patat.