Sync'd branch releases/aurora with upstream @ Mon Sep 29 15:57:33 PDT 2014