get_called_class -> static
Merge remote-tracking branch 'upstream/master'