Previous merge commit missed out some commits - only got 17 of #130's 27