1132_cJSON_fix
Make code python3 compatible
fixed without
Convert seconds to milliseconds for setTimeout + do not emit two errors when the handshake fails
Merge pull request #1138 from anatol/next

Change to `except ... as ...` syntax in setup.py script.
Merge branch '1132_cJSON_fix' into next
Init script: wait for instance to stop

Issue #1115
Makefiles: do not use variables if they are undefined
Merge branch 1115 into next

Review 707 by @mlucy

Closes #1115
adding printout to the start of rethinkdb export failed that clarifies its capabilities
fixing json decoding for nested objects in must specify one of --directory or --file to import
Merge branch 'next' into sam_939_alt