Merge "Fix PhanPluginDuplicateConditional* errors (#1)"