Fix for https://github.com/xolvio/rtd/issues/83
Merge remote-tracking branch 'origin/master'