Fix OpenFL native template order
Merge master