Merge pull request #1501 from Oldiesmann/release-2.1

! $context['from_ajax'] isn't always defined (fixes #1497)