Fix for the merger of the frame_order_cleanup branch.
The data_store/__init__.py changes of r27769 were lost with the r27951 merge commit.
Authored by: bugman 2015-10-02
Parent: [r27959]
Child: [r27961]
