Merge remote-tracking branch 'upstream/pull/4145'

diff --combined app/assets/stylesheets/common.scss
index f4a9ce4bca3a22201a70ce9182002efb70abd355,301709fe109a0754065acf9ab8321efe79d7d686..efd0ac265049fdbe4f77ebe5793ba020e112f781
--- 1/app/assets/stylesheets/common.scss
--- 2/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -1123,32 -1123,6 +1123,6 @@@ tr.turn:hover 
    }
  }
  
- /* Rules for the account settings page */
- 
- #accountForm .user_image {
-   margin-bottom: 0;
- }
- 
- #accountForm #user_image {
-   margin-left: 20px;
- }
- 
- #accountForm ul.accountImage-options {
-   margin-left: 120px;
- }
- 
- .nohome .location {
-   display: none;
- }
- 
- #homerow .message {
-   display: none;
- }
- 
- .nohome .message {
-   display: inline !important;
- }
- 
  /* Rules for the oauth authorization page */
  
  .oauth-authorize ul {
@@@ -1208,6 -1182,44 +1182,6 @@@
    display: none;
  }
  
 -/* Rules for highlighting fields with rails validation errors */
 -
 -.formError {
 -  display: inline-block;
 -  padding: 5px 10px;
 -  margin-top: 5px;
 -  border-radius: 4px;
 -  font-size: 12px;
 -  color: #fff;
 -  background-color: #ff7070;
 -}
 -
 -/* Rules for rails validation error boxes */
 -
 -#errorExplanation {
 -  width: 400px;
 -  border: 2px solid #ff7070;
 -  padding: 0 $lineheight/2;
 -  margin-bottom: $lineheight;
 -  background-color: #f0f0f0;
 -
 -  h2 {
 -    margin: 0 -10px 10px -10px;
 -    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
 -    font-weight: bold;
 -    font-size: 12px;
 -    background-color: #c00;
 -    color: #fff;
 -    text-align: left;
 -  }
 -
 -  p {
 -    color: #333;
 -    margin-bottom: 0px;
 -    padding: $lineheight/4;
 -  }
 -}
 -
  .search_form {
    background-color: $lightgrey;