Merge remote-tracking branch 'upstream/master' into styler_format_index

# Conflicts:
#	pandas/io/formats/templates/html_table.tpl

pandas/io/formats/templates/html_table.tpl

@@ -27,7 +27,7 @@
 {% else %}
 {% for c in r %}
 {% if c.is_visible != False %}
-      <{{c.type}} {%- if c.id is defined %} id="T_{{uuid}}{{c.id}}" {%- endif %} class="{{c.class}}" {{c.attributes}}>{{c.display_value}}</{{c.type}}>
+      <{{c.type}} {%- if c.id is defined %} id="T_{{uuid}}_{{c.id}}" {%- endif %} class="{{c.class}}" {{c.attributes}}>{{c.display_value}}</{{c.type}}>
 {% endif %}
 {% endfor %}
 {% endif %}