Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 04:25:21 PDT 2014