Added build from master (commit eea965eb8d)