Sync'd branch releases/aurora with upstream @ Tue Oct  7 14:58:39 PDT 2014