Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 06:49:42 PDT 2014