Workaround for possible gcc static once_flag
Merge branch 'next' of github.com:/maidsafe/MaidSafe into next