Merge pull request #1407 from sjinks/master

1.2.4 => master