Merge branch 'master' into merge/query-refactoring

docs/reference/query-dsl/range-query.asciidoc

@@ -109,12 +109,11 @@ accepts it), or it can be specified as the `time_zone` parameter:
     "range" : {
         "timestamp" : {
             "gte": "2015-01-01 00:00:00", <1>
-            "lte": "now",
+            "lte": "now", <2>
             "time_zone": "+01:00"
         }
     }
 }
 --------------------------------------------------
 <1> This date will be converted to `2014-12-31T23:00:00 UTC`.
-
-
+<2> `now` is not affected by the `time_zone` parameter (dates must be stored as UTC).