Fix all known problems with Alternatives (Issue #18 and more)
Delete diffs

Mistakenly included in commit
Merge remote-tracking branch 'e2openplugins/master'