Prepare for commonplace fiddle
Merge pull request #1511 from mattbasta/fiddle

Prepare for commonplace fiddle (bug 942233)