Auto-update from Dropbox 2014-08-25

This commit was automatically generated from https://www.dropbox.com/sh/hrj98qu9igzmk6x/HLcfdpb3WA