Imported Upstream version 2014.11.23
Merge tag 'upstream/2014.11.23'

Upstream version 2014.11.23