Merge branch 'dynamicportadaptation'
Authored by: miguelnunes 2014-06-19
Parent(s): [4dbf35][9c62bb]
Child(ren): [1e6a87]