Merge remote-tracking branch 'dpvc/issue692' into develop. Issue #692.

the commit.
This commit is contained in:
Davide P. Cervone 2014-03-20 05:48:57 -04:00
commit b9379938a8

File diff suppressed because one or more lines are too long