Merge branches 'stylus', 'httpImagePath' and 'retina-position'