Updating edx-ora2 branch