Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-04 d933cc2708fe10e648a9b454ba4c0b81ebb606c7

 interface/web/client/templates/client_template_edit_limits.htm

@@ -138,7 +138,7 @@
        </a>
      </h4>
    </div>
    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail>
    <div id="collapseMail" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingMail">
      <div class="panel-body">
                <div class="form-group">
                    <label for="limit_maildomain" class="col-sm-3 control-label">{tmpl_var name='limit_maildomain_txt'}</label>