Merge remote-tracking branch 'upstream/stable-1.0.x' into stable-1.0.x
Finishing touches added. Ready to be pulled
Merge branch 'stable-1.0.x' of github.com:ksuarz/epylog-modules into stable-1.0.x