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