fi injection on 20131008-040636
fr injection 20131130 and 20131101
CROSS-1358 | TimeConvert.type.MINUTE => need to check where this label is used
Merge commit '6779a689331849803a1c2d50b6847bc89923a6f4' into HEAD