Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 04:03:37 PDT 2014