Folding in uncommitted work
Update to include BlackBerry 10 devices