Merge "Support user-supplied timescales for authoring" into gingerbread