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