Merge pull request #1 from tomchristie/master

Merge upstream
Merge pull request #2 from tomchristie/master

Merge upstream
Not allow to pass an empty actions to viewset.as_view(). Refs issue #2171
Merge pull request #2175 from BrickXu/fix_2171

Not allow to pass an empty actions to viewset.as_view()