merge branch 'devel' of https://github.com/arangodb/arangodb into devel
merge branch 'devel' of https://github.com/arangodb/arangodb into devel

nekulin/arangodb,aurelijusb/arangodb,mujiansu/arangodb,pekeler/arangodb,kkdd/arangodb,kkdd/arangodb,nekulin/arangodb,abaditsegay/arangodb,razvanphp/arangodb,kkdd/arangodb,aurelijusb/arangodb,pekeler/arangodb,nvoron23/arangodb,nvoron23/arangodb,mujiansu/arangodb,mujiansu/arangodb,abaditsegay/arangodb,razvanphp/arangodb,nvoron23/arangodb,razvanphp/arangodb,razvanphp/arangodb,abaditsegay/arangodb,abaditsegay/arangodb,nvoron23/arangodb,mujiansu/arangodb,kkdd/arangodb,kkdd/arangodb,razvanphp/arangodb,nekulin/arangodb,abaditsegay/arangodb,razvanphp/arangodb,razvanphp/arangodb,aurelijusb/arangodb,nekulin/arangodb,mujiansu/arangodb,razvanphp/arangodb,nvoron23/arangodb,mujiansu/arangodb,nekulin/arangodb,mujiansu/arangodb,nvoron23/arangodb,razvanphp/arangodb,mujiansu/arangodb,kkdd/arangodb,nekulin/arangodb,mujiansu/arangodb,nvoron23/arangodb,mujiansu/arangodb,aurelijusb/arangodb,aurelijusb/arangodb,nekulin/arangodb,kkdd/arangodb,kkdd/arangodb,aurelijusb/arangodb,abaditsegay/arangodb,nvoron23/arangodb,pekeler/arangodb,pekeler/arangodb,nekulin/arangodb,nvoron23/arangodb,nekulin/arangodb,aurelijusb/arangodb,aurelijusb/arangodb,pekeler/arangodb,pekeler/arangodb,abaditsegay/arangodb,razvanphp/arangodb,kkdd/arangodb,abaditsegay/arangodb,nekulin/arangodb,pekeler/arangodb,pekeler/arangodb,nvoron23/arangodb,pekeler/arangodb,pekeler/arangodb,abaditsegay/arangodb,abaditsegay/arangodb,aurelijusb/arangodb,aurelijusb/arangodb,kkdd/arangodb