Merge pull request #515 from msabramo/pinpoint_unexpected_end_of_key_value_pairs_error

More info in "Unexpected end of key/value pairs" error
Conflicts:
	supervisor/datatypes.py