Squashed commit of the following:

commit 80de962
Author: Krunoslav Zaher <[email protected]>
Date:   Fri Jul 21 10:34:55 2017 +0200

    Adds 3.6.1 changes to `CHANGELOG.md`.

commit dcc77bd
Author: Krunoslav Zaher <[email protected]>
Date:   Thu Jul 20 12:15:25 2017 +0200

    Fixes issues with `andThen` operator. ReactiveX#1347

commit b343881
Author: Krunoslav Zaher <[email protected]>
Date:   Wed Jul 19 15:22:56 2017 +0200

    Improves locking behavior of `merge` and `switch` operators. ReactiveX#1344

commit e782081
Author: zhongwuzw <[email protected]>
Date:   Thu Jul 20 10:16:27 2017 +0800

    fix wrong semantic

commit 79ac3d0
Author: Krunoslav Zaher <[email protected]>
Date:   Tue Jul 18 19:55:06 2017 +0200

    Release 3.6.1

commit 2e63f16
Author: Krunoslav Zaher <[email protected]>
Date:   Tue Jul 18 19:49:44 2017 +0200

    Adds xcode9 to CI.

commit 0c057c8
Author: Albin "albinek" Sadowski <[email protected]>
Date:   Sun Jul 16 09:08:53 2017 +0200

    Add missing syntax highlighting

commit 3722e09
Author: Boris Kolozsi <[email protected]>
Date:   Tue Jul 18 13:32:31 2017 +0200

    unifying access control

commit ada09c4
Author: Boris Kolozsi <[email protected]>
Date:   Tue Jul 18 12:18:19 2017 +0200

    no need to be public, just not private

commit 0461f44
Author: Boris Kolozsi <[email protected]>
Date:   Tue Jul 18 09:51:35 2017 +0200

    rxcocoa build fix on xcode 9

commit 1314805
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 22:25:42 2017 +0200

    Release 3.6.0

commit 8c874c4
Author: Krunoslav Zaher <[email protected]>
Date:   Mon Jul 17 00:39:40 2017 +0200

    Improves sleep method in unit tests.

commit 11675f0
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 23:32:29 2017 +0200

    Updates SPM.

commit 846d608
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 23:26:59 2017 +0200

    Adds `delay` to `SharedSequence`.

commit eb5d238
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 23:19:55 2017 +0200

    Adds `timeout` to `PrimitiveSequence`.

commit c6d9ca0
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 22:45:03 2017 +0200

    Fixes UITests.

commit 95dc6fd
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 22:21:37 2017 +0200

    Removes redundant conformance to `Equatable` from `value` convenience on `NSControl`.

commit eccd8cc
Merge: 42d4250 3afb0e7
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 21:55:09 2017 +0200

    Merge branch 'sergdort-feature/reactive-uipickerview' into develop

commit 3afb0e7
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 21:22:05 2017 +0200

    Adds picker view adapter to SPM.

commit 7b866f0
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 20:25:58 2017 +0200

    Improves documentation to UIPickerView components, changes modelSelected type to [T], simplifies UIPickerView adapter example.

commit b5e1d84
Merge: 42d4250 d634687
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 16 18:47:04 2017 +0200

    Merge branch 'feature/reactive-uipickerview' of https://github.com/sergdort/RxSwift into sergdort-feature/reactive-uipickerview

commit d634687
Author: sergdort <[email protected]>
Date:   Sat Jul 15 18:42:25 2017 +0100

    Add tests for model at index path

commit 64773ed
Author: sergdort <[email protected]>
Date:   Sat Jul 15 18:20:11 2017 +0100

    run jazzy to remove ViewDataSourceType

commit 1e0c524
Author: sergdort <[email protected]>
Date:   Sat Jul 15 18:18:27 2017 +0100

    Remove unnecessary protocol and use SectionedViewDatasourceType

commit 42d4250
Author: Daniel Duan <[email protected]>
Date:   Thu Jul 13 23:54:10 2017 -0700

    Fix Small Issues in GettingStarted.md

    Read this excellent document today and noticed a few thing that bothered me:

    1. The `NS` part of `NSURL*` should be dropped in most cases.
    2. There are some trailing whitespaces.
    3. In one case, "your" is misspelled as "you".

commit b6fe1ff
Author: sergdort <[email protected]>
Date:   Fri Jul 14 15:11:11 2017 +0100

    Add changes to CHANGELOG.md

commit b03a192
Author: sergdort <[email protected]>
Date:   Fri Jul 14 13:55:34 2017 +0100

    remove UIPicker extension from TV as it’s not available there

commit 6d1c165
Author: sergdort <[email protected]>
Date:   Fri Jul 14 11:59:54 2017 +0100

    run jazzy

commit de8de1d
Author: sergdort <[email protected]>
Date:   Fri Jul 14 11:54:30 2017 +0100

    Add UIPickerView data source extensions tests

commit 3127ef4
Author: sergdort <[email protected]>
Date:   Fri Jul 14 11:13:03 2017 +0100

    Add `modelSelected` to the UIPickerView extension

commit b47f17b
Author: sergdort <[email protected]>
Date:   Fri Jul 14 11:04:16 2017 +0100

    Add `model(at: Int) -> Any` and ViewDataSource

commit d5a754d
Author: Krunoslav Zaher <[email protected]>
Date:   Wed Jul 12 22:22:48 2017 +0200

    Fixes deadlock with `shareReplayWhileLatest`. ReactiveX#1323

commit d215a2a
Author: magicmon <[email protected]>
Date:   Wed Jul 12 17:43:57 2017 +0900

    When importing a user list or image, the app was modified when the user failed to import the user due to a network error.

commit 5699fea
Author: magicmon <[email protected]>
Date:   Wed Jul 12 17:06:08 2017 +0900

    If "Allow Arbitrary Loads" is set to No in Info.plist, the "TableViewWithEditingCommands" example will exit as soon as you run it.
    So, added a catchError.

commit f55c3f6
Author: sergdort <[email protected]>
Date:   Wed Jul 12 17:31:25 2017 +0100

    Add convenience UIPickerView rx extensions example

commit 508454f
Author: sergdort <[email protected]>
Date:   Wed Jul 12 15:52:58 2017 +0100

    Add convenience UIPickerView adapters and extensions

commit de2837f
Merge: fa8a8bb ca938b6
Author: Shai Mishali <[email protected]>
Date:   Wed Jul 12 17:18:41 2017 +0300

    Merge pull request ReactiveX#1326 from MasayaHayashi724/fix-typo

    Fix typo: so -> do

commit ca938b6
Author: Masaya Hayashi <[email protected]>
Date:   Wed Jul 12 23:02:54 2017 +0900

    fix typo

commit eb6eb5a
Author: sergdort <[email protected]>
Date:   Mon Jul 10 21:53:59 2017 +0100

    Add UIPickerView adapter example

commit 4f3d803
Author: sergdort <[email protected]>
Date:   Mon Jul 10 20:32:35 2017 +0100

    Add missing method description

commit fa8a8bb
Author: Nolan Warner <[email protected]>
Date:   Sun Jul 9 22:36:18 2017 +0900

    Update label and variable names for consistancy

commit af450fc
Author: Nolan Warner <[email protected]>
Date:   Wed Jul 5 17:44:49 2017 +0900

    Update changelog

commit 130867b
Author: Nolan Warner <[email protected]>
Date:   Fri Jun 30 17:09:51 2017 +0900

    Update method prototype syntax in UICollectionView+Rx comments

commit 8d982e2
Author: Nolan Warner <[email protected]>
Date:   Fri Jun 30 16:59:53 2017 +0900

    Add UICollectionViewDelegate control event tests

commit deed0bc
Author: Nolan Warner <[email protected]>
Date:   Fri Jun 30 12:32:46 2017 +0900

    Add missing control events to UICollectionView+Rx

commit b318040
Author: sergdort <[email protected]>
Date:   Fri Jul 7 22:45:27 2017 +0100

    Add UIPickerView + rx.items tests

commit 52c6022
Author: sergdort <[email protected]>
Date:   Fri Jul 7 22:45:01 2017 +0100

    Default to 0 components and items

commit 39730ef
Author: grafele <[email protected]>
Date:   Thu Jul 6 10:04:22 2017 +0200

    fix typo in RxCocoaError debug description

commit 90cd66a
Author: sergdort <[email protected]>
Date:   Wed Jul 5 17:01:29 2017 +0100

    Add RxPickerViewDataSourceProxy, RxPickerViewDataSourceType and UIPickerView reactive extensions

commit 38552d5
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 2 21:11:55 2017 +0200

    Fixes unit tests warning.

commit d950ddd
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 2 21:07:03 2017 +0200

    Fixes warning on Linux.

commit 6b4b68e
Author: Krunoslav Zaher <[email protected]>
Date:   Sun Jul 2 20:08:01 2017 +0200

    Adds `andThen` to `Completable`.

commit b0a1118
Author: Casey Liss <[email protected]>
Date:   Fri Jun 30 09:17:42 2017 -0400

    adds UITableView.rx.modelDeleted

commit 4e06fc8
Author: Nolan Warner <[email protected]>
Date:   Thu Jun 29 12:15:57 2017 +0900

    Add UIScrollViewDelegate control event tests

commit b7d1bdd
Author: Nolan Warner <[email protected]>
Date:   Thu Jun 29 12:15:39 2017 +0900

    Add missing control events to UIScrollView+Rx

commit 4da31c6
Author: JolieYang_Pro <[email protected]>
Date:   Thu Jun 29 14:32:14 2017 +0800

    :bug: ReactiveX#1309 change calculator model

commit 002512f
Author: JolieYang_Pro <[email protected]>
Date:   Tue Jun 27 01:03:42 2017 +0800

    :bug: ReactiveX#1309 continuous input operations should update operator

commit f0d0ec9
Author: Christian Tietze <[email protected]>
Date:   Thu Jun 22 09:32:12 2017 +0200

    don't swallow duplicate control events

commit 6eba4ab
Author: Brian Hardy <[email protected]>
Date:   Fri Jun 16 10:50:06 2017 -0400

    Avoids the use of expectations since the subscription will fire synchronously.

commit 38e00f9
Author: Brian Hardy <[email protected]>
Date:   Fri Jun 16 10:13:01 2017 -0400

    Fixes arguments to perform to avoid a crash

commit 342bbd1
Author: Brian Hardy <[email protected]>
Date:   Thu Jun 15 15:42:53 2017 -0400

    Adds failing test illustrating crash on UIBarButtonItem tap.

commit 60d1d88
Author: Romain Bertozzi <[email protected]>
Date:   Wed Jun 14 09:57:42 2017 -0400

    UITabBar+Rx: update methods prototypes in comments

    This commit updates methods prototypes in some comments. These comments
    did not represent the current syntax of the methods.

commit 1e2cbf6
Author: hagmas <[email protected]>
Date:   Wed May 31 14:47:52 2017 +0900

    Remove concrete same-type requirements for Swift3.0

commit 1a8e7f4
Author: hagmas <[email protected]>
Date:   Tue May 16 22:13:14 2017 +0900

    Add concat operator to Completable

commit 46325a0
Author: Håvard Fossli <[email protected]>
Date:   Wed Jun 14 10:34:21 2017 +0200

    Move word inside paranthesis

commit 53bda68
Author: Håvard Fossli <[email protected]>
Date:   Wed Jun 14 10:30:46 2017 +0200

    Tidy up clutter in top of README.md

    Moved note about swift 2.x branch to "requirements" section. Removed "About RxSwift" because I find it excessive considering it is just below the super title `ReactiveX for Swift`

commit c0644c2
Author: Christian Tietze <[email protected]>
Date:   Wed Jun 14 08:32:42 2017 +0200

    add delegate tests

commit ea6c252
Author: Christian Tietze <[email protected]>
Date:   Tue Jun 13 10:27:22 2017 +0200

    forward controlTextDidChange to non-Rx delegate

commit 498e22f
Author: Håvard Fossli <[email protected]>
Date:   Mon Jun 12 14:02:21 2017 +0200

    Tone down warning about swift 3.0 requirement

commit 44d7659
Author: Krunoslav Zaher <[email protected]>
Date:   Wed Jun 14 09:11:54 2017 +0200

    Renames `UIViewControler+RxTests.swift` to `UIViewController+RxTests.swift`.

commit 57a7261
Author: Krunoslav Zaher <[email protected]>
Date:   Wed Jun 14 09:07:47 2017 +0200

    Modifies links.

commit 69dbcd5
Author: Dominik Arnhof <[email protected]>
Date:   Tue Jun 6 14:22:49 2017 +0200

    added UIViewController Reactive extension for tvOS

commit caec217
Author: Romain Bertozzi <[email protected]>
Date:   Sat Jun 10 11:30:29 2017 -0400

    Fixes a typo.

    This commits fixes a typo where the word nondeterministic was spelled
    nondetermininstic.

commit f60363c
Author: Serhiy Krivtsov <[email protected]>
Date:   Wed May 31 00:14:06 2017 +0300

    Removed duplication of words

commit ff62249
Author: Christian Tietze <[email protected]>
Date:   Thu Jun 1 10:12:49 2017 +0200

    pass file & line along to XCTestAssert

    This way the failure is reported at call site

.travis.yml

@@ -35,6 +35,9 @@ matrix:
       - os: osx
         osx_image: xcode8.2
         env: TEST=iOS
+      - os: osx
+        osx_image: xcode9
+        env: TEST=iOS
 
 notifications:
   slack: rxswift:3ykt2Z61f8GkdvhCZTYPduOL

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 
 ## Master
 
+## [3.6.1](https://github.com/ReactiveX/RxSwift/releases/tag/3.6.1)
+
+#### Anomalies
+
+* Fixes compilation issue with Xcode 9b3. #1341
+* Fixes issues with `andThen` operator. #1347
+* Improves locking behavior of `merge` and `switch` operators. #1344
 
 ## [3.6.0](https://github.com/ReactiveX/RxSwift/releases/tag/3.6.0)
 

Documentation/Traits.md

@@ -379,7 +379,7 @@ Any observable sequence can be converted to `Driver` trait, as long as it satisf
 
 So how do you make sure those properties are satisfied? Just use normal Rx operators. `asDriver(onErrorJustReturn: [])` is equivalent to following code.
 
-```
+```swift
 let safeSequence = xs
   .observeOn(MainScheduler.instance)       // observe events on main scheduler
   .catchErrorJustReturn(onErrorJustReturn) // can't error out

Rx.playground/Sources/SupportCode.swift

@@ -5,7 +5,7 @@ import Dispatch
  - parameter description: example description
  - parameter action: `Void` closure
  */
-public func example(_ description: String, action: (Void) -> Void) {
+public func example(_ description: String, action: () -> Void) {
     printExampleHeader(description)
     action()
 }
@@ -24,7 +24,7 @@ public enum TestError: Swift.Error {
  - parameter delay: time in seconds to wait before executing `closure`
  - parameter closure: `Void` closure
  */
-public func delay(_ delay: Double, closure: @escaping (Void) -> Void) {
+public func delay(_ delay: Double, closure: @escaping () -> Void) {
 
     DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
         closure()

Rx.xcodeproj/project.pbxproj

@@ -91,13 +91,6 @@
 		A5CD038D1F1660F40005A376 /* RxPickerViewAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CD03891F1660F40005A376 /* RxPickerViewAdapter.swift */; };
 		AAE623761C82475700FC7801 /* UIProgressView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE623751C82475700FC7801 /* UIProgressView+Rx.swift */; };
 		AAE623771C82475700FC7801 /* UIProgressView+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE623751C82475700FC7801 /* UIProgressView+Rx.swift */; };
-		AC96A93B03DD2E61711ECD6A /* FlatMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC96AAD9C5F314D4003B2FA6 /* FlatMap.swift */; };
-		AC96ABFCAE998F71FEC81096 /* FlatMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC96AAD9C5F314D4003B2FA6 /* FlatMap.swift */; };
-		AC96AE97A66A21D61756F7CF /* FlatMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC96AAD9C5F314D4003B2FA6 /* FlatMap.swift */; };
-		AC96AFEEC3AF1E901FD35E59 /* FlatMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC96AAD9C5F314D4003B2FA6 /* FlatMap.swift */; };
-		BCC973591EE6A0F70057DB52 /* Observable+FlatMapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCC973581EE6A0F70057DB52 /* Observable+FlatMapTests.swift */; };
-		BCC9735A1EE6A0F70057DB52 /* Observable+FlatMapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCC973581EE6A0F70057DB52 /* Observable+FlatMapTests.swift */; };
-		BCC9735B1EE6A0F70057DB52 /* Observable+FlatMapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCC973581EE6A0F70057DB52 /* Observable+FlatMapTests.swift */; };
 		B44D73EC1EE6D4A300EBFBE8 /* UIViewController+RxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 271A97421CFC99FE00D64125 /* UIViewController+RxTests.swift */; };
 		B44D73ED1EE6D57600EBFBE8 /* UIViewController+Rx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 271A97401CFC996B00D64125 /* UIViewController+Rx.swift */; };
 		C8093CC51B8A72BE0088E94D /* Cancelable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8093C491B8A72BE0088E94D /* Cancelable.swift */; };
@@ -1266,6 +1259,7 @@
 		C8D132451C42D15E00B59FFF /* SectionedViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D132431C42D15E00B59FFF /* SectionedViewDataSourceType.swift */; };
 		C8D132461C42D15E00B59FFF /* SectionedViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D132431C42D15E00B59FFF /* SectionedViewDataSourceType.swift */; };
 		C8D132471C42D15E00B59FFF /* SectionedViewDataSourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8D132431C42D15E00B59FFF /* SectionedViewDataSourceType.swift */; };
+		C8E8BA401E2BBDC800A4AC2C /* (null) in Sources */ = {isa = PBXBuildFile; };
 		C8E8BA5A1E2C181A00A4AC2C /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8A56AD71AD7424700B4673B /* RxSwift.framework */; };
 		C8E8BA641E2C186200A4AC2C /* Benchmarks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E8BA621E2C186200A4AC2C /* Benchmarks.swift */; };
 		C8E8BA721E2C18AE00A4AC2C /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8E8BA6F1E2C18AE00A4AC2C /* main.swift */; };
@@ -1722,8 +1716,6 @@
 		A520FFFB1F0D291500573734 /* RxPickerViewDataSourceProxy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxPickerViewDataSourceProxy.swift; sourceTree = "<group>"; };
 		A5CD03891F1660F40005A376 /* RxPickerViewAdapter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxPickerViewAdapter.swift; sourceTree = "<group>"; };
 		AAE623751C82475700FC7801 /* UIProgressView+Rx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIProgressView+Rx.swift"; sourceTree = "<group>"; };
-		AC96AAD9C5F314D4003B2FA6 /* FlatMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlatMap.swift; sourceTree = "<group>"; };
-		BCC973581EE6A0F70057DB52 /* Observable+FlatMapTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+FlatMapTests.swift"; sourceTree = "<group>"; };
 		C809396D1B8A71760088E94D /* RxCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C80939E71B8A71840088E94D /* RxCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C8093BC71B8A71F00088E94D /* RxBlocking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = RxBlocking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2425,7 +2417,6 @@
 				C820A8171EB4DA5900D431BC /* Empty.swift */,
 				C820A8141EB4DA5900D431BC /* Error.swift */,
 				C820A7FB1EB4DA5900D431BC /* Filter.swift */,
-				AC96AAD9C5F314D4003B2FA6 /* FlatMap.swift */,
 				C820A7F31EB4DA5900D431BC /* Generate.swift */,
 				C820A7F41EB4DA5900D431BC /* GroupBy.swift */,
 				C820A8151EB4DA5900D431BC /* Just.swift */,
@@ -2715,7 +2706,6 @@
 				C820A9D91EB50CAA00D431BC /* Observable+DoOnTests.swift */,
 				C820A9C91EB50A7100D431BC /* Observable+ElementAtTests.swift */,
 				C820A9AD1EB5073E00D431BC /* Observable+FilterTests.swift */,
-				BCC973581EE6A0F70057DB52 /* Observable+FlatMapTests.swift */,
 				C820A9751EB4F92100D431BC /* Observable+GenerateTests.swift */,
 				C820A9D11EB50B0900D431BC /* Observable+GroupByTests.swift */,
 				C820A9691EB4F64800D431BC /* Observable+JustTests.swift */,
@@ -4304,7 +4294,6 @@
 				C820A9AE1EB5073E00D431BC /* Observable+FilterTests.swift in Sources */,
 				C83509511C38706E0027C24C /* HistoricalSchedulerTest.swift in Sources */,
 				C83509521C38706E0027C24C /* MainSchedulerTests.swift in Sources */,
-				BCC973591EE6A0F70057DB52 /* Observable+FlatMapTests.swift in Sources */,
 				C835094D1C38706E0027C24C /* BagTest.swift in Sources */,
 				54700CA01CE37E1800EF3A8F /* UINavigationItem+RxTests.swift.swift in Sources */,
 				C820A9C21EB509FC00D431BC /* Observable+SkipTests.swift in Sources */,
@@ -4356,7 +4345,6 @@
 				C8C4F1881DE9DF0200003FA7 /* UITableView+RxTests.swift in Sources */,
 				C83509BB1C38750D0027C24C /* Control+RxTests.swift in Sources */,
 				C820A9FF1EB5110E00D431BC /* Observable+DematerializeTests.swift in Sources */,
-				BCC9735A1EE6A0F70057DB52 /* Observable+FlatMapTests.swift in Sources */,
 				C83509EE1C3875580027C24C /* Observable.Extensions.swift in Sources */,
 				C83509BD1C38750D0027C24C /* ControlPropertyTests.swift in Sources */,
 				C83509E11C3875500027C24C /* TestVirtualScheduler.swift in Sources */,
@@ -4614,7 +4602,6 @@
 				C8350A041C38755E0027C24C /* CurrentThreadSchedulerTest.swift in Sources */,
 				C8353CE81DA19BC500BE3F5C /* Recorded+Timeless.swift in Sources */,
 				C8A9B6F61DAD752200C9B027 /* Observable+BindTests.swift in Sources */,
-				BCC9735B1EE6A0F70057DB52 /* Observable+FlatMapTests.swift in Sources */,
 				C820A99C1EB5001C00D431BC /* Observable+MergeTests.swift in Sources */,
 				C8350A051C38755E0027C24C /* DisposableTest.swift in Sources */,
 				C820A96C1EB4F64800D431BC /* Observable+JustTests.swift in Sources */,
@@ -4641,6 +4628,7 @@
 			files = (
 				C85217F31E33ECA00015DD38 /* PerformanceTools.swift in Sources */,
 				C8E8BA721E2C18AE00A4AC2C /* main.swift in Sources */,
+				C8E8BA401E2BBDC800A4AC2C /* (null) in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4793,7 +4781,6 @@
 				C83D73C51C1DBAEE003DC470 /* ScheduledItem.swift in Sources */,
 				C820A8A91EB4DA5A00D431BC /* WithLatestFrom.swift in Sources */,
 				C867817D1DB8129E00B2029A /* Queue.swift in Sources */,
-				AC96AE97A66A21D61756F7CF /* FlatMap.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5030,7 +5017,6 @@
 				C83D73C41C1DBAEE003DC470 /* ScheduledItem.swift in Sources */,
 				C820A8A81EB4DA5A00D431BC /* WithLatestFrom.swift in Sources */,
 				C867817C1DB8129E00B2029A /* Queue.swift in Sources */,
-				AC96ABFCAE998F71FEC81096 /* FlatMap.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5191,7 +5177,6 @@
 				C83D73C71C1DBAEE003DC470 /* ScheduledItem.swift in Sources */,
 				C820A8AB1EB4DA5A00D431BC /* WithLatestFrom.swift in Sources */,
 				C867817F1DB8129E00B2029A /* Queue.swift in Sources */,
-				AC96A93B03DD2E61711ECD6A /* FlatMap.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5550,7 +5535,6 @@
 				C83D73C61C1DBAEE003DC470 /* ScheduledItem.swift in Sources */,
 				C820A8AA1EB4DA5A00D431BC /* WithLatestFrom.swift in Sources */,
 				C867817E1DB8129E00B2029A /* Queue.swift in Sources */,
-				AC96AFEEC3AF1E901FD35E59 /* FlatMap.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

RxBlocking.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxBlocking"
-  s.version          = "3.6.0"
+  s.version          = "3.6.1"
   s.summary          = "RxSwift Blocking operatos"
   s.description      = <<-DESC
 Set of blocking operators for RxSwift. These operators are mostly intended for unit/integration tests

RxBlocking/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxCocoa.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxCocoa"
-  s.version          = "3.6.0"
+  s.version          = "3.6.1"
   s.summary          = "RxSwift Cocoa extensions"
   s.description      = <<-DESC
 * UI extensions

RxCocoa/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxCocoa/iOS/DataSources/RxPickerViewAdapter.swift

@@ -12,7 +12,7 @@
     import RxSwift
 #endif
 
-private class RxPickerViewArrayDataSource<T>: NSObject, UIPickerViewDataSource, SectionedViewDataSourceType {
+class RxPickerViewArrayDataSource<T>: NSObject, UIPickerViewDataSource, SectionedViewDataSourceType {
     fileprivate var items: [T] = []
 
     func model(at indexPath: IndexPath) throws -> Any {
@@ -31,7 +31,7 @@ private class RxPickerViewArrayDataSource<T>: NSObject, UIPickerViewDataSource,
     }
 }
 
-private class RxPickerViewSequenceDataSource<S: Sequence>
+class RxPickerViewSequenceDataSource<S: Sequence>
     : RxPickerViewArrayDataSource<S.Iterator.Element>
     , RxPickerViewDataSourceType {
     typealias Element = S

RxExample/RxExample/Services/ReachabilityService.swift

@@ -10,7 +10,11 @@
 import RxSwift
 #endif
 
-import class Dispatch.queue.DispatchQueue
+#if swift(>=3.2)
+    import class Dispatch.DispatchQueue
+#else
+    import class Dispatch.queue.DispatchQueue
+#endif
 
 public enum ReachabilityStatus {
     case reachable(viaWiFi: Bool)

RxSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "RxSwift"
-  s.version          = "3.6.0"
+  s.version          = "3.6.1"
   s.summary          = "RxSwift is a Swift implementation of Reactive Extensions"
   s.description      = <<-DESC
 This is a Swift port of [ReactiveX.io](https://github.com/ReactiveX)

RxSwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6.0</string>
+	<string>3.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RxSwift/ObservableConvertibleType.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-/// Type that can be converted to observable sequence (`Observer<E>`).
+/// Type that can be converted to observable sequence (`Observable<E>`).
 public protocol ObservableConvertibleType {
     /// Type of elements in sequence.
     associatedtype E