Imported Upstream version 2012.12.16
Merge tag 'upstream/2012.12.16'

Upstream version 2012.12.16
Imported Upstream version 2013.02.07
Merge tag 'upstream/2013.02.07'

Upstream version 2013.02.07
Imported Upstream version 2013.04.24
Merge tag 'upstream/2013.04.24'

Upstream version 2013.04.24