Upstream commits to sickbeard
Merge branch 'master' of github.com:nicholasvmoore/docker-sickbeard