upstream/3.0_20140825

Antonio Terceiro

@terceiro

45b5122b · Imported Upstream version 3.0~20140825 · Aug 25, 2014

Upstream version 3.0~20140825