i before e except after c
Comment out test that is SIGSEGV'ing Issue 645
Merge remote-tracking branch 'origin/master'