Merge improvements made in QtQuick2.0 version of the components.