P4Merge 2014.2
Merge pull request #8486 from gpakosz/p4merge-2014.2

P4Merge 2014.2