Sync'd branch releases/aurora with upstream @ Fri Oct  3 14:36:36 PDT 2014