Merge pull request #25587 from mimadrid/update/parallel-20170422
parallel: 20170122 -> 20170422
authored by Pascal Wittmann and committed by GitHub 8 years ago e7322f1f 0bae6d0a