Merge branch 'release/0.8.3.6' into develop
Merge branch 'hotfix/0.8.3.7'
Merge branch 'hotfix/0.8.3.7' into develop

Conflicts:
	Trakttv.bundle/Contents/Code/core/plugin.py
Fixed bug with valid_address() on PMS v0.9.9.0
Fixed bug where incorrect data was used in client matching
Fixed issue with parsing the client name from log files
Bumped version to 0.8.3.8
Merge branch 'hotfix/0.8.3.8'
Fixed issue where media could be both scrobbled and marked as seen
Bumped version to 0.8.3.9
Updated trakt.py (v0.6.0-beta)
Use Trakt.configure() to fix an initialization bug on some platforms
Ensure manager is initialized when trying to trigger a sync
Added [core.localization] wrapper for L(), more descriptive trigger failure messages
Merge branch 'hotfix/0.8.3.9'
[activity_logging] fixed parsing issue when there is an active transcode session
Updated trakt.py
[activity_logging] make "query" optional
Updated trakt.py
Bumped version to 0.8.3.10