syncing with master from plex,inc