Modification to calculation of child width in order to support variable width child elements
Merge branch 'variable-width-child'