Edited commit message to mention bug# and pushed to master as

314b63e0b4372681aec165113ae2a0349eaaa357

and

ecba50bb79a49b317c4b1e718f4732b36438227f.