Merge branch 'develop' into 008-solr-knowledge
Drupal update core 7.31
Merge branch '008-solr-knowledge' into develop