Merge branch 'release-v0.6.4'

lib/client.js

@@ -2527,6 +2527,9 @@ MatrixClient.prototype.getTurnServers = function() {
  *
  * @param {Number=} opts.pollTimeout The number of milliseconds to wait on /events.
  * Default: 30000 (30 seconds).
+ *
+ * @param {Filter=} opts.filter The filter to apply to /sync calls. This will override
+ * the opts.initialSyncLimit, which would normally result in a timeline limit filter.
  */
 MatrixClient.prototype.startClient = function(opts) {
     if (this.clientRunning) {