Merge remote-tracking branch 'upstream/master'

  <script type="text/javascript">

    function setSettings(){

      {% if settings is defined%}

        document.getElementById('blacklistSelect').value = "{{settings['blacklistSelect']}}";

        document.getElementById('whitelistSelect').value = "{{settings['whitelistSelect']}}";

        document.getElementById('unlistedSelect').value = "{{settings['unlistedSelect']}}";

        document.getElementById('timeSelect').value = "{{settings['timeSelect']}}";

        document.getElementById('startDate').value = "{{settings['startDate']}}";

        document.getElementById('endDate').value = "{{settings['endDate']}}";