Merged contributions for PORTLETSPEC3-10 from Scott Nicklous