Merge branch 'gabrielecirulli-patch-1'

Author: gajus

README.md

@@ -53,9 +53,7 @@ const initialState = Immutable.fromJS({
 
 export default (state = initialState, action) => {
   if (action.type === LOCATION_CHANGE) {
-    return state.merge({
-      locationBeforeTransitions: action.payload
-    });
+    return state.set('locationBeforeTransitions', action.payload);
   }
 
   return state;
@@ -74,7 +72,7 @@ import {
 
 const history = syncHistoryWithStore(browserHistory, store, {
   selectLocationState (state) {
-    return state.get('routing').toJS();
+      return state.get('routing').toObject();
   }
 });
 ```