Merge branch 'master' into vdom

app/assets/javascripts/discourse/templates/topic.hbs

@@ -134,7 +134,7 @@
 
             {{#if model.details.suggested_topics.length}}
               <div id="suggested-topics">
-                <h3>{{unbound view.suggestedTitle}}</h3>
+                <h3>{{{unbound view.suggestedTitle}}}</h3>
                 <div class="topics">
                   {{#if model.isPrivateMessage}}
                   {{basic-topic-list

app/assets/javascripts/discourse/views/topic.js.es6

@@ -167,7 +167,7 @@ const TopicView = Ember.View.extend(AddCategoryClass, AddArchetypeClass, Scrolli
 
   suggestedTitle: function(){
     return this.get('controller.model.isPrivateMessage') ?
-      I18n.t("suggested_topics.pm_title") :
+      "<i class='private-message-glyph fa fa-envelope'></i> " + I18n.t("suggested_topics.pm_title") :
       I18n.t("suggested_topics.title");
   }.property()
 });

lib/active_record/connection_adapters/postgresql_fallback_adapter.rb

@@ -22,12 +22,12 @@ class PostgreSQLFallbackHandler
 
     Thread.new do
       begin
-        logger.info "#{self.class}: Checking master server..."
+        logger.warn "#{self.class}: Checking master server..."
         connection = ActiveRecord::Base.postgresql_connection(config)
 
         if connection.active?
           connection.disconnect!
-          logger.info "#{self.class}: Master server is active. Reconnecting..."
+          logger.warn "#{self.class}: Master server is active. Reconnecting..."
           ActiveRecord::Base.establish_connection(config)
           Discourse.disable_readonly_mode
           @master = true