Merge branch 'extractconvertdirectadaptation'
Authored by: miguelnunes 2014-09-18
Parent(s): [1f4b9a][ab8a11]
Child(ren): [394db2]