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