Auto-update from Dropbox 2014-03-23

This commit was automatically generated from https://www.dropbox.com/sh/hrj98qu9igzmk6x/HLcfdpb3WA
Auto-update from Dropbox 2014-03-31

This commit was automatically generated from https://www.dropbox.com/sh/hrj98qu9igzmk6x/HLcfdpb3WA
Auto-update from Dropbox 2014-04-01

This commit was automatically generated from https://www.dropbox.com/sh/hrj98qu9igzmk6x/HLcfdpb3WA
Auto-update from Dropbox 2014-04-02

This commit was automatically generated from https://www.dropbox.com/sh/hrj98qu9igzmk6x/HLcfdpb3WA
Merged dev into dev-ui