Remove question mark from filename

Think of the Windows users!

Change-Id: I813732baeebbe4cb697af39ae3723aa7f1580062
Merge "Remove question mark from filename"