Merge branch 'fileparametertypetest'
Authored by: miguelnunes 2014-11-10
Parent(s): [7d07b1][adf77c]
Child(ren): [868807]