Completed task #293.
Merge pull request #294 from blackberry/next-293

Completed task #293.