Merge with soc.2013.gobjectification.plugins

2016-10-06, Daniel Atallah