Minor - PHP warning
Minor - format code.
Adding calendar import see BT#7802