upstream/2.5.0-20131225

Hideki Yamane

@henrich

b5018121 · Imported Upstream version 2.5.0-20131225 · Dec 30, 2013

Upstream version 2.5.0-20131225