Using minimized versions with maps in as many places as posible
Merge remote-tracking branch 'origin/master'