Merged publisher_feature branch into master

Signed-off-by: Andrew Deitrick <ajdeitrick@gmail.com>