Better handling of inline images in Articles.
Merge remote-tracking branch 'NI-ipad/master'