Revert "Revert "Pushing updates - 2014_05_11""

This reverts commit 8a160d1f96c47510dff78569984ec4771f1060fe.
swap ip