Merge GPlugin branch

2015-04-27, Jorge Villaseñor