Merging r730:732 from trunk to branches/0.3. Forwardports fancy bufferviews.