Change upload to accept multipart/form-data (Issue #111)
Merge branch 'develop' of https://github.com/cassandra-project/platform.git into develop