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