Merged in 3.1 (pull request #4761)

Updating branch HOR-1500 with last changes (2016-08-13)
This commit is contained in:
Julio Cesar Laura Avendaño
2016-08-13 11:16:50 -04:00
25 changed files with 3073 additions and 2567 deletions

File diff suppressed because it is too large Load Diff