Fix numpy long double declarations
Try collections then ordereddict for OrderedDict
Merge remote-tracking branch 'upstream/master'