Update from mobilejazz:master