fixed the infinite recursion in ge_tbib_data, fixes #403
removed an extra statement inserted by mistake, refs #403
fixed infinite recursion issue, merged #415, resolved conflict, closes #403
Merge tag 'm15_001'

tagging m15_001