Fix crash on TreeMap
Merge remote-tracking branch 'origin/master'
MutableObservableFuture changes.