Merge the relevant changes from seantis.reservation since April 2014