Added r6542, r6543, r6545, r6547, r6548, r6549, r6550, r6551 & r6552 from /tags/modified-shop-1.06 to trunk