Begin updating master for 14.04LTS compatibility