bmbouter Merge remote-tracking branch 'pulp/2.8-release' into HEAD

Latest commit 2b11ff6

May 17, 2016