Merge branch 'refs/heads/pulls/eunit' into custom