Imported Upstream version 02.16.2014.12.15
Merge tag 'upstream/02.16.2014.12.15'

Upstream version 02.16.2014.12.15