Merge branch 'origin/develop' into parallel_block_download

Update into latest devp2p

Author: rairyx

requirements.txt

@@ -11,9 +11,9 @@ werkzeug
 ipython>=5.4.0,<6.0.0
 statistics
 requests
-rlp>=0.5.1,<0.6.0
-devp2p>=0.8.0
-ethereum>=1.5.1
+rlp>=0.6.0,<0.7.0
+devp2p>=0.9.3
+ethereum>=2.0.4
 pbkdf2
 scrypt
 pexpect

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.0
+current_version = 1.5.1a0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<num>\d+))?

setup.py

@@ -58,7 +58,7 @@ def run_tests(self):
 
 # *IMPORTANT*: Don't manually change the version here. Use the 'bump2version' utility.
 # see: https://github.com/ethereum/pyethapp/wiki/Development:-Versions-and-Releases
-version = '1.5.0'
+version = '1.5.1a0'
 
 setup(
     name='pyethapp',