Merge branch 'sfc-3.11'

Merge sfc fixes destined for 3.11 so we can avoid conflicts with
development for 3.12+.
This commit is contained in:
Ben Hutchings 2013-08-21 14:19:36 +01:00
commit abc71bb939