Bug 917543 - Use robocop.ini on x86 also; r=armenzg
Merge remote-tracking branch 'origin/master' into vcs_multi_repo