Merge remote-tracking branch 'woodchuck/master'