Merge from master (1.0.4)
Updated manifest and recompiled