Sync'd branch releases/aurora with upstream @ Tue Oct  7 00:33:34 PDT 2014