Imported Upstream version 2014.11.21
Merge tag 'upstream/2014.11.21'

Upstream version 2014.11.21