Merge remote-tracking branch 'quintela/tags/migration/20170504' into staging