Merge remote-tracking branch 'barttenbrinke/master'
Convert simple `if` to `or` on assignment
Merge pull request #295 from presidentbeef/assignment_of_if_results

Convert simple `if` to `or` on assignment