Leftover from 5a0e53a6832c0ccf524b3552caf7bf328fd908e2
Merge branch '1.3'