Merged in dheeyi/processmaker/PM-1130 (pull request #2188)

PM-1130
This commit is contained in:
Julio Cesar Laura Avendaño
2015-05-15 09:06:08 -04:00