correct query to get inherits actions (closes #3637)
resize noimage when needed (closes #3636)
Merge pull request #666 from Eric-Brison/3.2-I3636

3.2 i3636