Sync'd branch releases/aurora with upstream @ Mon Sep 29 09:42:39 PDT 2014