Sync'd branch releases/aurora with upstream @ Mon Sep 29 10:41:30 PDT 2014