Fix for bug using Clang 3.4
Merge branch 'next' of github.com:maidsafe/MaidSafe-Drive into next