2.1.x Update

Update contents to include latest 2.1.1, 2.1.2 and 2.1.3 releases.