I'm going to try to merge master to frameworks again, please hold commits until you see the merge commit. Boud