Updated Qi's patch and minor fix.
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next