avoid double calculation and calculate under release build
Merge branch 'next' of https://github.com/maidsafe/MaidSafe-RUDP into next