Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 18:33:42 PDT 2014