Sync'd branch releases/aurora with upstream @ Fri Oct  3 10:51:32 PDT 2014