Sync'd branch releases/aurora with upstream @ Wed Oct  8 18:27:35 PDT 2014