merge from WordPress-Android@1a74364d0