Fixed signature of get_context_data
Call super get_context_data
Merge remote-tracking branch 'origin/master'